From 2268d57b3b6c3b30b5562cebb7f05ef3d8a056ea Mon Sep 17 00:00:00 2001
From: Kalita Alexey <kalita.alexey@outlook.com>
Date: Wed, 8 Feb 2017 18:15:06 +0300
Subject: [PATCH] Fixed tests

---
 tests/build.rs    | 28 ++++++++++++++++++++++++----
 tests/metadata.rs | 17 +++++++++++++++++
 2 files changed, 41 insertions(+), 4 deletions(-)

diff --git a/tests/build.rs b/tests/build.rs
index 75ca7dcee..c37405e62 100644
--- a/tests/build.rs
+++ b/tests/build.rs
@@ -2510,7 +2510,12 @@ fn compiler_json_error_format() {
     {
         "reason":"compiler-message",
         "package_id":"bar 0.5.0 ([..])",
-        "target":{"kind":["lib"],"name":"bar","src_path":"[..]lib.rs"},
+        "target":{
+            "kind":["lib"],
+            "crate_types":["lib"],
+            "name":"bar",
+            "src_path":"[..]lib.rs"
+        },
         "message":"{...}"
     }
 
@@ -2524,21 +2529,36 @@ fn compiler_json_error_format() {
         },
         "features": [],
         "package_id":"bar 0.5.0 ([..])",
-        "target":{"kind":["lib"],"name":"bar","src_path":"[..]lib.rs"},
+        "target":{
+            "kind":["lib"],
+            "crate_types":["lib"],
+            "name":"bar",
+            "src_path":"[..]lib.rs"
+        },
         "filenames":["[..].rlib"]
     }
 
     {
         "reason":"compiler-message",
         "package_id":"foo 0.5.0 ([..])",
-        "target":{"kind":["bin"],"name":"foo","src_path":"[..]main.rs"},
+        "target":{
+            "kind":["bin"],
+            "crate_types":["bin"],
+            "name":"foo",
+            "src_path":"[..]main.rs"
+        },
         "message":"{...}"
     }
 
     {
         "reason":"compiler-artifact",
         "package_id":"foo 0.5.0 ([..])",
-        "target":{"kind":["bin"],"name":"foo","src_path":"[..]main.rs"},
+        "target":{
+            "kind":["bin"],
+            "crate_types":["bin"],
+            "name":"foo",
+            "src_path":"[..]main.rs"
+        },
         "profile": {
             "debug_assertions": true,
             "debuginfo": 2,
diff --git a/tests/metadata.rs b/tests/metadata.rs
index 349de9fc1..69dcf12f7 100644
--- a/tests/metadata.rs
+++ b/tests/metadata.rs
@@ -28,6 +28,9 @@ fn cargo_metadata_simple() {
                         "kind": [
                             "bin"
                         ],
+                        "crate_types": [
+                            "bin"
+                        ],
                         "name": "foo",
                         "src_path": "[..][/]foo[/]src[/]foo.rs"
                     }
@@ -93,6 +96,9 @@ fn cargo_metadata_with_deps_and_version() {
                         "kind": [
                             "lib"
                         ],
+                        "crate_types": [
+                            "lib"
+                        ],
                         "name": "baz",
                         "src_path": "[..]lib.rs"
                     }
@@ -125,6 +131,9 @@ fn cargo_metadata_with_deps_and_version() {
                         "kind": [
                             "lib"
                         ],
+                        "crate_types": [
+                            "lib"
+                        ],
                         "name": "bar",
                         "src_path": "[..]lib.rs"
                     }
@@ -157,6 +166,9 @@ fn cargo_metadata_with_deps_and_version() {
                         "kind": [
                             "bin"
                         ],
+                        "crate_types": [
+                            "bin"
+                        ],
                         "name": "foo",
                         "src_path": "[..]foo.rs"
                     }
@@ -218,6 +230,7 @@ fn workspace_metadata() {
                 "targets": [
                     {
                         "kind": [ "lib" ],
+                        "crate_types": [ "lib" ],
                         "name": "bar",
                         "src_path": "[..]bar[/]src[/]lib.rs"
                     }
@@ -237,6 +250,7 @@ fn workspace_metadata() {
                 "targets": [
                     {
                         "kind": [ "lib" ],
+                        "crate_types": [ "lib" ],
                         "name": "baz",
                         "src_path": "[..]baz[/]src[/]lib.rs"
                     }
@@ -291,6 +305,7 @@ fn workspace_metadata_no_deps() {
                 "targets": [
                     {
                         "kind": [ "lib" ],
+                        "crate_types": [ "lib" ],
                         "name": "bar",
                         "src_path": "[..]bar[/]src[/]lib.rs"
                     }
@@ -310,6 +325,7 @@ fn workspace_metadata_no_deps() {
                 "targets": [
                     {
                         "kind": [ "lib" ],
+                        "crate_types": ["lib"],
                         "name": "baz",
                         "src_path": "[..]baz[/]src[/]lib.rs"
                     }
@@ -351,6 +367,7 @@ const MANIFEST_OUTPUT: &'static str=
         "description": null,
         "targets":[{
             "kind":["bin"],
+            "crate_types":["bin"],
             "name":"foo",
             "src_path":"[..][/]foo[/]src[/]foo.rs"
         }],
-- 
2.30.2